removed some unneeded snippets, added a bunch more, minor fixed to some