reordering enum vals, added periods to comments