Some more updates.

Switching back to other computer, mainly.