comments added and some housekeeping

Signed-off-by: degrigis <fbi.gritti@gmail.com>