minor changes

minor changes and bug fixes