Fixed XLS to work properly with error checking and new parts