Started some cleanup of the mess I made, more cleaning inbound