Fixed some bugs.
Fixed some bugs.

Phase 1 is still incomplete, and for all I know could still be
all wrong, but I prefer to commit anyway.

clasp-developers/SICL,vtomole/SICL,clasp-developers/SICL,clasp-developers/SICL,vtomole/SICL,vtomole/SICL,clasp-developers/SICL,vtomole/SICL