Split code into modules, handle USR1, minor fixes.