Integrating Elmer Update in Billing and fixing some bugs