Added license information, cleanups to follow.