commit with tasks fixed, and some other good stuff