A lot of small changes. This version is ready to be released.