Minor tweaks here and there, completely finished (for now) SMV class