Various amendments, suggestion regarding to PR 221

Feel free to pick any of them, or squash them.