Fixed my own mistakes