Some code arrangements. Doc fix. New version