Updates, updates...

Merge new features from main branch back into this one.