cleanup
make fallbacks accessible and consolidate error handling