some minior fixes