Added comment and exported more.