Fixed some small bugs.
Everything works and nothing hurt.
Merge branch 'namespacing'