BJORN: I fixed some bugs.

I fixed some bugs.