Minor updates in a few places. I'll search for more once I get back to my computer