update - rudimentary analysis, bugfixes