New options / bug fixes