couple additions and tweaks