made some fixes to things I broke
Merge pull request #247 from ebbyw/Ebby

made some fixes to things I broke