Updates and bugfixes