Tweaks and working through TODOs