A very helpful commit message. I fixed some bugs.