but there may be some unrelated fixes in there as well. For example, I changed the constant 32 to 128!