ulaf (sp?) touches up some bits