General Fixes, started implementing D term