lots of cleanup, still problem w initial click