[REVIEW] Some modifications

I created this PR to let you review my modifications and eventually create one or more selective PRs to do the actual merges (or, if you like all of them, you might merge this PR as well).