Bug fixes.

Fixes #1 and fixes #2
Added a status strip