DAOs fixed, Spring wiring improved