fixed for 1.5 and some typos