Fix demo listening port
More critical style tweaks