MHAPI clean up + small update