Some clean-up and README improvements