fixups
Merge pull request #14 from WiFL-co/mvp-fixups

Mvp fixups