Updates to add more data checks and the ability to override some special numbers