Small additions and tweaks