Bug Fixs for tablets. minor changes/comments in other files