Enabling context viewer and fixing a number of bugs