Made some little fixes here and there