Lo_Fi prototype some fixes