Some style updates, added variable list and sorting on index
More work for variable support
More work on variables and bug fixes