Fixes:
- Various Farplan Fixes and improvements