updated couple fixes
Merge pull request #24 from omnipotentuser/foundation

updated couple fixes