There's now a lot of magic numbers in the code.  I wonder if you should create some `const`s to better document and isolate them all?