Standalone Rebuild

Includes fix for crash on cancel, and update to include path information