made expand not dumb, fixed remove