more cleaning up and stuff