minor changes and etc.