various changes + replace $ with : in the server listing