Update source and README, usable now