bug fixes and new option