moved some more start/stop stuff into the Container. auto format/indent some src.