Fleshed out SVEN more, and cleaned up a fair bit of related stuff.