Comments and hashgen added