Commented SV and minor changes

Might fix a lot of the problems.. might not. Changes to functionality
are marked with "25" (the date)