add changes + super fast fixes