Many interface improvements, optimizations