Update to version 3 including various fixes