* move stuff in header and subst.c arround to be better grouped