Minor formatting updates and 0 handling