small fixes and new options