ffinish the first 17 minutes and fix some bugs