fixed stuff blabla