fixes complete, cleanup & refactor next