Fixed most compile errors
Started work on SearchWorker
Some other changes