Fixes for comment

i've done
* https://trello.com/c/ioF3o6vC/49--
* https://trello.com/c/HnT2T0r4/46--