major updates, fix timing errors