fixed minner bugs
Merge branch 'staging' of https://github.com/scrollback/scrollback into staging