Fixed somethings..