[ConWork.h] Small fix
[BufferWork.h] Full rewrite
Test...again...