Minro Fixes

Calanader function stuffs in time.. undoning