Fixed a bug and found another.