lots of changes; i resolve to commit more