some fixes and new options