Forgetting to commit, as usual. Too many changes to really mention. I am going to work on this in the future, hopefully.