minor fixes and attribute redo