Cosmetic changes
Solving some warnings
Cosmetic
Little refactor
Adding assert
Adding more correctness to memory module
xMerge branch 'dev'