Finished lesson 15 & 16, fixed some bugs