Fix CLI file extension handling, improve error trapping
Update README