Clean up and live testing bug fixes