cleaned up and reordered some tasks