minor updates

Big thanks to Jamie Levy and Michael Hale Ligh