fix all small issues
fix all small issues