fixes billing
fixes units crossing error
forgot analytics