some bugfixes and fallback option