Add the server rules from forum and small lint issues
Change wording