fixes here and there...