fixed typos
fixed inconsistency
fixed bug