Some minor updates....