Fix shelf key bug - and handle bad shelf keys better
Add comments to constraints display logic