All obvious issues fixed. Usability pending.