fixed timer issue / other issues sorta fixed?