added first fixes