more changes

including a critical fix to work with current versions of eid servers