Updated the license and fixed some stupidity