fixed most bill issues