Fixed loads of initial bugs

Not a great start, I’ll admit