more options fixes