wrote more tests, fixed more errors, migrated more code