Fix for issue #64 (ambiguous investments) and issue #67 (underpayment clarification)