Crystal Eyes: General improvements.

General improvements.