done, hopefully just minor checking/cleaning