Fix at/diff functions (maybe), delete's terrible