Fix notice
formatting fixes
fix notices and formatting fixes
Merge pull request #903 from dlobo/MiscFixes

Misc fixes