huge clean up, sitll not working tho, heh