More misc. cleanup
Add license