Fix license/copyright.
Also port some "glaringly obvious" bugfixes from HEAD. Hope it doesn't cause problems.