various minor changed and fixed typos