New style system, optimizations, clearer architecture, bug fixes