All fixed

Fixed all issues that got posed to master branch....