fixing my mistakes