Reconfigured a bit to fix some issues.