fix a few things before demo