Bug fixes for all

I ran into a few of the same issues that folks had been bringing up - figured I'd take a look and see if I could fix any of them. It's all "works for me", so if there's any other problems or we need to clean things up, let me know! :grinning: