clened up
fixed more stuff