great - okay, makes sense. 
thanks for going through these all - yay, less yellow triangles! ;)  

feel free to merge!