Few more typos/bugs