Changes re: brucem's feedback