additions and tweaks