Small Changes and hot fixes for worksheets