Added more logging.
Tidied up framework dependencies.