fixedminor issues