fix issues live, rebuild