Few bugs corrected
Merge branch 'sam' of github.com:Code-Crunch/CM3028 into sam