many fixes, service cukes now passing :D