Tips and expiration dates on estimates

Having the ability to add an expiration date on an estimate would be very helpful, often times clients don't decline an estimate. Also, being able to have users who pay by card have the ability to add a tip to an invoice would be extremely helpful