Test
Minor updates, fix to stop crash on boot found, but is to do with mainthread cb :S needs work