Add point remove
Fix small things