small changes; (define!) fixed