change load order
remove some trailing whitespace
tidy up logging
replace method missing with something a bit tidier