Fixed, added and changed lots of stuff