Fixed some bugs
Now the behaviors are saved