More changes and tweaks