finished fixing my mistakes