fixed some regexs and added some more hashes.