migrated from raw thread blocking to locks and conditions
removed bad asserts, PANIC!
Merge branch 'fixp2'
won 5 points back.... not