added comments, bit of diambiguation