Sprint 5 - commit 2

Fixing bugs in the system