mc modifications and fixes