more modifiers issues fixed + remove even more Builder mentions
fix loading single element