minor fixes; hide some routines
6 files changed