fix NPE on double stop
fix some lifecycle issues from a time before start/stop