minor changes and file rename