Minor changes + fixed update functionality.