bug fixes and sender as constructor option