Fixed my silly mistakes + added more info