random fixes here and there...