Test 1

Fixes a few tiny things which will probably cause more errors