fixes and new options