Lots of stuff fixed <3