merge recent fixes from "test100121" branch back into "supersized_box" branch

There doesn't seem to be a necessity of the "test" branch anymore. Let's merge it back into the "main" supersized branch. Please run a physical test of the current code, to make sure everything is working (if this was already done during the previous merge request, then it's fine.)