Minor fixes also closes #4