Fixed everything according to FullStack Foundation specifications