Performance improvements everywhere.
Added crystal back to the source test.