restructure attributes a bit, update attribute docs