Minor improvement and doc changes