Updated readme and some fixes.