Fixed the crash.  Fixing bugs.