more options, bugfix