fixing stability issues and first search commit