Fixed shading
Exit on binding conflict
Removed completed TODO