fix: a large array of fixes, some refactoring, and a general improvement suite