Extended version check and fixed some errors.