some minifixes