added update and fixes