Updates 4

A mix of changes, old and new.