mistakes fixed and finished