got rid of some gunk; and cleaned up responsiveness