added fix for screen change;minor fixes