Several re-sizing fixes
Versioning