changed small things to suit wamba server