Remove some incorrect code
Add section on behaviors