Fixing up some issues raised in pull request and adding the missing files (Stupid me forgetting to add them - travis should pass