Made lots of updates, fixes, merges, etc.