fix a bunch of comments as per #161 and bugs seen along

Signed-off-by: Fotis Georgatos <fotis.georgatos@uni.lu>