Some bug fixes, still working on haproxy to work on completely new box