fixing some notices
Merge branch 'work'