Several minor changes, including slots for hooks (to be added later).