fix ports, cleanup