many puzzle cleanups -- it's looking pretty good now