031114 2350
@ minor clean-ups