Adding more fixes 80%complete