v. 2.0: fixing beta-quality bugs (2)...