1.9.0.1 track

update mage and some clean up and refinement along with the update