fix rush mistakes