not tested , just little fixes