Made some small changes...