Comments functionality corretced and some bug fixes