Cleaned up some, and added licenses.