moved stuff around
Fixed a typo