timing fixes / important low level fix / test code