Added custom tip amount and other bug fixes