A lot of fixes and refactoring
Merge branch 'master' of https://github.com/ralucaa/PSD3-sem2