Fix bugs.  Change Makefiles.  Add terminal plugin.