Trying to find T_sys bug, changed mbcal routines

Signed-off-by: Danny Price <dan@thetelegraphic.com>