Few functional improvements.