Additions and tweaks