Slight improvments, also minor UI tweaking.  Not much actual progress,
just a cleanup commit