fix some issues
minor changes
minor changes