Multiple Fixes & Refactorings