fix billing handler
update invoice templates