Cleaning up code, maybe making websockets work.
Merge branch 'hotfix-0.3.3'