Merge request.

Small issues fixed. Check commit messages.