fix default values and added validation on the custom amount field