bug fixes and new options