Fixed names for Oct data and some small improvments