Small Chanegs to Form and Waiver Search adnd reconfigure environment variables