update comments with my new findings

Change-Id: I58e07994e627ce980573812cbe56a068f66b1862
make debug builds fail hard on unexpected conditions

Change-Id: I0732ce65757ee29e5ad12cb576c5b64ed0edeaee