Still problems with evaluating attributes. Fixed a few.