timer bugs fixed