fixing all my mistakes :P