A couple of trivial fixes
Change a couple of labels for master version
Change title
Minor bug fixes