Assorted updates... starting to try to gel into a coherent app/site framework