Made more small changes