Found bug in limits, also extended some