updated to reduce diff with ubuntu's defaults