lots of updates and bugfixes