Jaguar

Some more improvemnts (see #74 for discussion).