fixes and end of version confusion