Fix & Clean up
Add LICENSE