Some minor updates & bugfixes.