fixed some ambiguity, typos