Fixes; New version