Many updates and bugfixes