Bumped Spark dependency
Cleaned up PB option handling