last commit of today, mnior fixes