More closes

Yes, this should have been in the last PR. I misread my screen and didn't realize these changes were all in the same file. Sorry about that.