Small improvements, corrected typos