Further misc. work