various small changes, added order of service