Fixed everything except 8th item from Anna's review.