more bugs fixed -- found doing regression testing
 -Erik
11 files changed