Fixed typo + minor tweaks