some changes that squaggle suggested (no idea if i'm doing them correctly, though)