Moving to plain API urls (no ports)

Moving to plain API urls (no ports) and some other small improvements.