all fixed, i suppose! please, merge it!!!