More improvements to Worksheet