Fixed some task stuff!