Fixed some errors and added gems for checkpoints 7 and 8