made fixed
almost completely fixed