micro changes
some changes
some extend done
some more changes
Merge pull request #26 from khan4019/master

micro changes