reference: A few more improvements.