Fixed some minor problems and temporarily removed the carry-option.