Fixed some massive errors

Last push wasn’t stable.