Removed a lot of redundant entries and merged everything into one May or may not be canon, I don't care
