Fixing stupid bugs
Cleaning up expandStates
make search not crash