some minor changes and tweaks