small fixes :alien:
Merge pull request #1 from drossellat/small_fixes

small fixes :alien: