minor changes and tweaks