incremental; various bugs in initial success code