Work on adding autocomplete, index options and general file cleanup