Add info to readme and some fixes