add/remove, minor fixes