add new tasks, bug fix in task parser, minor code refactoring