Minor changes: formatting, name corrections