update with a few changes/bugfixes