Several improvements ; WIP ignore option