More dubugging, reliability fixes