First complete re-reading and some corrections