Added improvements, fixed typos