Some more changes. MAKE SURE U UNINSTALL BEFORE MAKING ANY CHANGES