few fixes here and there