fixed multiple errors one left to settle