fixed some typo, added more class annotation