renaming
removed migration, fixed defaults