More Refactoring, Fixing & Testing