loads of bugs fixed, search string now works!