some project fixes before demo