Getting familiar with the codebase. Meanwhile fixing some typos and deleting some #NoShitSherlock comments.
Merge pull request #1 from amedee/master

#NoShitSherlock