Many Under the hood changes
Fix up quotation marks
Merge pull request #95 from MarcelGerber/under-the-hood

Many Under the hood changes