Finally fixed the normal functions;

Haven't done the Challenge functions. Maybe it makes sense to do them later for practice.