Nambly pambly tweaks for rubocop

Just a few little things altered so that rubocop is at lowest error rate possible excepting line length, string literals and utf-8.