Updating the space limits and some constants