Added proper handling of default arguments for remapping
Started work on simplifying rescaling configs.