Save raw values + added reapply switch + better debug output