definition bodies indented, added missing refs