Fixing possible bug & typos