Fixed some minor issues

Hi Franz

Please review the PR. I've made all the changes as you've indicated.