Fisheye and Crucible added.
Fixes, fixes, fixes...