update per fnordahl's suggestions
update per fnordahl's suggestions

ChrisMacNaughton/chrismacnaughton.github.com,ChrisMacNaughton/chrismacnaughton.github.com,ChrisMacNaughton/chrismacnaughton.github.com