Updated a lot of stuff, basic fixes