finishing up some attribute work