XLS additions and PY fixes