Added a few things working towards new task handling system. Mainly bug fixes for 1.1. (now v1.1.1)