merge correct minor mistakes