Commit of last few months

Countless changes — This is just an update after Git has been ignored
for a while