Fixed all my mistakes