Indexing working. Also fixed normalization bug