Latest updates and bugfixes