more fixes here and there and so