Misc additions and tweaks.