Made them more general, attempted to fix an error with version number checking.