Syntax fixes, migrations
Fixed some tests, other borked code