Refactor + bug fixes to Fornax integration