minor program structure changes