Closes #12, closes #13 and closes #14
Additionnaly, corrects the add() action.