..
Fixed some bugs.