little fixes here and there