Hopefully I have time to do more updates in the new year...