Assorted updates to alt. version (I fell asleep, forgot what I did).