fixed all sanitation
Merge pull request #167 from mikedao/fixsan

fixed all sanitation