Several fixes, see Readme.md on 11/4/14