Some more edits with help of Quaisaq.
Fixes for the previous commit.