Several Fixes (in progress)
Refactoring + typo