some finishing work, switched back to live keys