Small fixes

Added requests from #3

Added some items of #2, but did not accept the pull request.