Bug fixes + License