Better task list in build

@Warry - see PR #770