Final (I think) push

Fixed some bugs cause by ripping out the DOD stuff.