minor fixex, more limits