a bit of cleanup, added migration options to DataModel, added Notes entity