added rem, rdoubledagger
fixed merge
fixed merge (for real this time)