Readme update and some fixes.