fix remarks

@stdweird: Don't review and/or merge this in yet, I'll let you know when I'm done...