hitmanager tweaks, webserver in a subprocess
resolved conflicts