Afew small changes

Cleaned up the pull request...
Nothing to major just some small changes