checking in improvements made from deskshell project.