Subtract and combinations + minor style enhancements