MINOR CHNAGES: Small improvements.