More features, fixes and README