minor arangement changes and input