Latest updates from @echooocc based on feedback.