version fixing and build issues corrected