All files now up-to-date on Git

All of the recent changes by both Eric, and the ensuing corrections by
Mes, are incorporated into this commit. This is confirmed working on
Minix