Small fix for optimize, version changes, etc.

Sorry for the stupid, epic merge here.