Final tweaks. Consider this to be MVP official shipped