Merge pull request #212 from mrdomino/master

screw around with the warnings, fixing some, introducing others