Added copyright and tweaks