Update license
Minor changes
Fix error message parsing.