several misc. updates