rename some things, allow options hash