added fallbacks & misc tweaks