added some fixes
added new fixes