Fixing bugs and updating copyrights/credit