more changes and tweaks