almost finished fixing my commits