Various changes
Committed resolved changes + 1 minor change.