added rui's fixes