Rolling up all changes

All uncommitted changes (no details as got interupted).