2bugs and typos corrected