Made misc changes