Fix comment adding and some stuff to the framework

Signed-off-by: netcho <kkotlarski@abv.bg>