fixes and notices added
Merge pull request #1 from nkamensky/master

fixes and notices added