verious fixes