Use also recovery and track our system/core

Using cm recovery kills setup wizard causing it to fc non stop.