Code and README touchups