made fixes