Some changes to resolve a few reported issues/complaints.