fixed a couple bugs, and finished critical thinking