add misc support stuff