updated code

See Commit History document on Google Drive for a summary of changes