Fixed some limits, etc.