minor cleanup, benchmark problem fixed