clean up and bug stomp