Merge pull request #428 from leider/master

Small tweaks and fixes (bunch of)