Dfoxpowell/bugfixes

3 bug fixes, issue number in commit messages