Fixed a typo, added more functions