2.0.1: improvements/simplify things