Some work on start scripts; reorganized while at it