[sMigration] minor changes
Merge branch 'sMigration' of github.com:63RM4N90/PAW-Sprint-1 into sMigration
[sMigration] merged some wrong stuff of mine with the correct stuff in the branch