Minor changes pre demo