Updated obs view implementation, misc. fixes