Checking in small changes pre demo