Merge pull request #7 from overridelogic/unstable

Bunch of fixes for existing features.