The error has been found and fixed - now for cleanup and testing