add in manual migration for 0015, cleanup, typos