Fixed NTextField and many other enhancements