+ more fixes