SDM: - All parameters from the config are now read & used

- minor cleanups