Added licenses, and little improvements