A lot of fixes; README