Made updates to a majority of core to CM10.1/4.2.2