tweaks and stuff. must find memory leak…