smaller Fixes/Refactoring