Added Val's new class, other minor tweaks