various fixes
removed commented code
Merge pull request #7 from theaob/development

various fixes