fix supah stupid bug, cleanup