Add 1 to capacity to compensate for difference in capacity (my code) and passenger capacity (website).
Various fixes and improvements.