Small changes & fixes suggested by users.