Correct some minor bugs, switch to clean vbsp_config