Some bugfixes and addition reduction rules.