Fix some findbugs-issues and apply some code-cleanup and apply some smaller pull requests. This closes #74, This closes #75, This closes #76