Reverted the advance_DE changes. Also fixed some minor bugs