Fixes insert and remove. Updates files