forgot import
cleanup
update client info, and better billing domain list