Tweaked some Veneficia stuff and abstracted (yes, again) some block stuff.