Changed a lot of stuff to more closely follow Feder/Voss.