Some additions and tweaks