minor changes to Option.scala