Fixed various problems with the addition.