Some cleanup and README stuff