Many small changes made; see my email for the detailed log.