Add debugging
Refactor + bug fixes to Fornax integration