Changed Task classes to be more correct and not activity dependent
Some bugfixing