added drop migration, bug fixes