Make some more changes and tweaks