fixed some definitions