Might want to offer repairs on a piece work basis. You don't want someone to be suprised by the bill after the job.
I know we all run into unexpected problems that take more time. Probably should bid the job a bit high for unexpectec problems and you can always bill less if you dont have any problems and leave the customer happy.