Add cleaning resources on stop
Few minor bugs