Updated evaluation functions, error checking