Add status bar, fix some bugs, add some more options that don't work yet
Merge