Fixed multiple bugs
Merge branch 'cbr' of https://github.com/SalamiCo/ISBC-P2 into cbr