Completed leaf size (both forms), seems to work well, have added checks with appropriate output.