Adding Update and small fixes