Step 7/10 - Bugfixing

Fixes #2 and #3
Bad construction of objects