make update not overwritable
reduced Warnings, Cleanup, fixed typos