fixes here and there