Major Changes to XLS parser. Corrections and function rewrite.