Some final changes to version 3