fixing stuff
fixed i think...