Fix up error reporting
upgrade search
Move untouched libs to ext - baseify search
Clean up messages