Fixed reset detection

Output formatting improvements