bugfix and copyediting