Fixed a typo + minor changes