Minor improvements and README update.