minor improvements, multiple ip support