Checks added for mismatched site ids, tidy code and help pages