lots and lots of fixes relating to the merge to get ircd to compile again(working is another matter)