Update README and small update to trunk