Corrected issue #1 + a bunch of warnings
Merge branch 'master' of github.com:FaerieFrOSt/Creeks