Increased versioning, added debugging