fixed some definitions (Thx TimSad)