fixed typo,changed method & property names