fastfixes (by Kevin).

One fix remain: user can see too long. I'll fix it when I have access to
the compiler.