Cleaned up and fixed some things

Removed redundant or unnecessary things.
Cleaned out completions a little (needs further refinement).
Organized snippets and added a few more.