cleanup + fix hostnames