Minor mods and updated copyright