Minor changes; comments mostly