Tested and cleaned up server regexs