Added missing comments and fallback option