Misc changes

Some more changes!