add more option/fixes