Bug fixes & automation of DSR almost done