minor updates and tweaks