little changes + new tasks