Task adding. + few bugfixes. fixes #17 closes #45