A few niggling issues fixed


More...