final debugging before demo

final debugging before demo