Touchups

@pnts Please look this over and let me know what you think.