updates to final demo version