Corrected my own silly mistakes...