Latest updates & bugfixes (after testing)