Many updates for version 1.5