Invalidate model when adding behavior

Also completed comments