BIG CHANGES

Huge amounts of things fixed