add versioning, few small changes