A little bit of cleaning, RIG now saves status, not breaking correctly though