changes to no_OPTION and dist setup