renamed some methods & options