Ongoing cleanup and basic feature enhancments.