mc modifications and fixes - finalising