big clean up, make it work