minor fixes at start