Some minor fixes, update and remove not done yet