This fixes the corner bug. The example is now fully fluent. PLus a bit
of cleanup. Time for the new features =).