fixed a minor linking bug; removed some commented out code --KW