Fixed some bugs and some bar view stuff.