Added task list & some misc stuff