Add flock to jsh.
More work on services.
Various improvements for service and other things