[fix] bugs and errors in Brandon and Isabel's code