Added remove, fixed insert