Big Changes

All sorts of new fixes