broke things :)
fixed things again
some stuff fixed