A few more refinements. Let me know what you think, good or bad....