Namechange + minor corrections