Fix bugs.  Variables are not initialized properly...