Better values for size, fixed ending issue