Larger stacks and some other cleanup