fixed screenshot code
fixed some search issues, and screenshot issues, also updates some tests