a couple fixes here and there