Moved billing out of the way. Fixed some exception handling.