Speed up and optimize search
Updated .gitignore
Updated TODO