ENH: Fixing some details..