Lots of changes

Fixing lots of bits