[#4] A few minor changes.