[task2]  - adding now truly works + server side fix
[task2]  - several minor fixes