New version and some fixes