Added some convenience views and fixed some bugs