Committed several changes from over time