Added several new options, but code needs rework... And also the documentation