Fixxed issues addressed in comments to the puul request.