added more commenting to MLVA and fixed a bug where sort by criteria would still change if the user selected cancel.
fixed conflicts