Some touch-ups
Merge branch 'master' of https://github.com/mrugani/bookmark