Fixed some more bugs.
0.12.5