feature/init_fixes