Miscellacenous updates