Fix for #215 and some other related improvements

Yes, but those were introduced by you, so we can probably rename them, right? :)