Fixed: base url & getting rid of excess config
Removed: stale patch.diff