fixing update and other stuff