Fixed a few little bugs. Big bug still not found.