Minor additions & changes

Been meaning to push this stuff back your way for weeks, sorry for the delay.