changes and tweaks