Updated basic info & made minor structure changes