Added loads of new crap, fixes