Fix to handle large numbers at start of domain and some comments