Pulling updates and bugfixes