Echo works, patched some lib bugs