Updated, fixed lots of things