fixed more /dr bugs