Tuesday night changes

@cesmoak want to review and pull these in?