fixes and some tasks added