fixes and notices added