Some Major Changes and fixes!